From a7099d1468c4be397610595a94375f582afa79f7 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 22 Feb 2016 18:28:30 -0800 Subject: [PATCH] range: simplify code Now that everything is in the main gadget, we can just let it propagate drawing to its children. --- gtk/gtkrange.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 3dcd634a91..8ed2366622 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2259,6 +2259,8 @@ gtk_range_render_trough (GtkCssGadget *gadget, if (priv->has_origin) gtk_css_gadget_draw (priv->highlight_gadget, cr); + gtk_css_gadget_draw (priv->slider_gadget, cr); + return gtk_widget_has_visible_focus (widget); } @@ -2269,20 +2271,7 @@ gtk_range_draw (GtkWidget *widget, GtkRange *range = GTK_RANGE (widget); GtkRangePrivate *priv = range->priv; - gtk_css_gadget_draw (priv->trough_gadget, cr); - gtk_css_gadget_draw (priv->slider_gadget, cr); - - if (priv->stepper_a_gadget) - gtk_css_gadget_draw (priv->stepper_a_gadget, cr); - - if (priv->stepper_b_gadget) - gtk_css_gadget_draw (priv->stepper_b_gadget, cr); - - if (priv->stepper_c_gadget) - gtk_css_gadget_draw (priv->stepper_c_gadget, cr); - - if (priv->stepper_d_gadget) - gtk_css_gadget_draw (priv->stepper_d_gadget, cr); + gtk_css_gadget_draw (priv->gadget, cr); return GDK_EVENT_PROPAGATE; } -- 2.30.2